From 58bad1d409874f5a6f4d72c0b96ac420a4f3d6b6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 26 May 2019 22:42:49 -0400 Subject: [PATCH] cell area context: Drop the priv pointer --- gtk/gtkcellareacontext.c | 36 ++++++++++++------------------------ gtk/gtkcellareacontext.h | 2 -- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/gtk/gtkcellareacontext.c b/gtk/gtkcellareacontext.c index c9ed22063b..64b54f78f0 100644 --- a/gtk/gtkcellareacontext.c +++ b/gtk/gtkcellareacontext.c @@ -59,6 +59,7 @@ static void gtk_cell_area_context_real_allocate (GtkCellAreaContext *context, gint width, gint height); +typedef struct _GtkCellAreaContextPrivate GtkCellAreaContextPrivate; struct _GtkCellAreaContextPrivate { GtkCellArea *cell_area; @@ -85,7 +86,6 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkCellAreaContext, gtk_cell_area_context, G_TYPE_OB static void gtk_cell_area_context_init (GtkCellAreaContext *context) { - context->priv = gtk_cell_area_context_get_instance_private (context); } static void @@ -183,7 +183,7 @@ static void gtk_cell_area_context_dispose (GObject *object) { GtkCellAreaContext *context = GTK_CELL_AREA_CONTEXT (object); - GtkCellAreaContextPrivate *priv = context->priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); if (priv->cell_area) { @@ -202,7 +202,7 @@ gtk_cell_area_context_set_property (GObject *object, GParamSpec *pspec) { GtkCellAreaContext *context = GTK_CELL_AREA_CONTEXT (object); - GtkCellAreaContextPrivate *priv = context->priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); switch (prop_id) { @@ -222,7 +222,7 @@ gtk_cell_area_context_get_property (GObject *object, GParamSpec *pspec) { GtkCellAreaContext *context = GTK_CELL_AREA_CONTEXT (object); - GtkCellAreaContextPrivate *priv = context->priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); switch (prop_id) { @@ -253,7 +253,7 @@ gtk_cell_area_context_get_property (GObject *object, static void gtk_cell_area_context_real_reset (GtkCellAreaContext *context) { - GtkCellAreaContextPrivate *priv = context->priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); g_object_freeze_notify (G_OBJECT (context)); @@ -292,7 +292,7 @@ gtk_cell_area_context_real_allocate (GtkCellAreaContext *context, gint width, gint height) { - GtkCellAreaContextPrivate *priv = context->priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); priv->alloc_width = width; priv->alloc_height = height; @@ -321,12 +321,10 @@ gtk_cell_area_context_real_allocate (GtkCellAreaContext *context, GtkCellArea * gtk_cell_area_context_get_area (GtkCellAreaContext *context) { - GtkCellAreaContextPrivate *priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); g_return_val_if_fail (GTK_IS_CELL_AREA_CONTEXT (context), NULL); - priv = context->priv; - return priv->cell_area; } @@ -413,12 +411,10 @@ gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context, gint *minimum_width, gint *natural_width) { - GtkCellAreaContextPrivate *priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context)); - priv = context->priv; - if (minimum_width) *minimum_width = priv->min_width; @@ -445,12 +441,10 @@ gtk_cell_area_context_get_preferred_height (GtkCellAreaContext *context, gint *minimum_height, gint *natural_height) { - GtkCellAreaContextPrivate *priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context)); - priv = context->priv; - if (minimum_height) *minimum_height = priv->min_height; @@ -535,12 +529,10 @@ gtk_cell_area_context_get_allocation (GtkCellAreaContext *context, gint *width, gint *height) { - GtkCellAreaContextPrivate *priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context)); - priv = context->priv; - if (width) *width = priv->alloc_width; @@ -567,12 +559,10 @@ gtk_cell_area_context_push_preferred_width (GtkCellAreaContext *context, gint minimum_width, gint natural_width) { - GtkCellAreaContextPrivate *priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context)); - priv = context->priv; - g_object_freeze_notify (G_OBJECT (context)); if (minimum_width > priv->min_width) @@ -611,12 +601,10 @@ gtk_cell_area_context_push_preferred_height (GtkCellAreaContext *context, gint minimum_height, gint natural_height) { - GtkCellAreaContextPrivate *priv; + GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context); g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context)); - priv = context->priv; - g_object_freeze_notify (G_OBJECT (context)); if (minimum_height > priv->min_height) diff --git a/gtk/gtkcellareacontext.h b/gtk/gtkcellareacontext.h index b78b3bbb20..bc3e7fb7dd 100644 --- a/gtk/gtkcellareacontext.h +++ b/gtk/gtkcellareacontext.h @@ -44,8 +44,6 @@ struct _GtkCellAreaContext { /*< private >*/ GObject parent_instance; - - GtkCellAreaContextPrivate *priv; }; /** -- 2.30.2